From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 8 Oct 2018 19:24:00 +0000 (+0200)
Subject: fileUtils: Make loadInterfaceXML usable from tests
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~929^2^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=00613b304f333b7a1b18987c1256c5668b9b7481;p=gnome-shell.git

fileUtils: Make loadInterfaceXML usable from tests

The current code assumes that the resource has been installed,
which isn't the case when running distcheck.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/255
---

diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
index 24add2e7e..32c08759e 100644
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -75,8 +75,9 @@ function recursivelyMoveDir(srcDir, destDir) {
 let _ifaceResource = null;
 function loadInterfaceXML(iface) {
     if (!_ifaceResource) {
-        // don't use global.datadir so the method is usable from tools
-        let path = Config.PKGDATADIR + '/gnome-shell-dbus-interfaces.gresource';
+        // don't use global.datadir so the method is usable from tests/tools
+        let dir = GLib.getenv ('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
+        let path = dir + '/gnome-shell-dbus-interfaces.gresource';
         _ifaceResource = Gio.Resource.load(path);
         _ifaceResource._register();
     }